Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 22:54:59 +0000 (15:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 22:54:59 +0000 (15:54 -0700)
commit20138e9cca593a963e47e66b3afcbff555da4b2e
tree10abeb9bf1928c9979362afc1fa637040ff44fc4
parent104b064875bef9f8078cc453ce35b205e4e00d06
parent0bf9f02692ce21c1273c6e8ec3954ff406ea4061
Merge from trunk.
42 files changed:
src/ChangeLog
src/alloc.c
src/bidi.c
src/buffer.c
src/buffer.h
src/callint.c
src/callproc.c
src/character.h
src/charset.c
src/composite.c
src/dispextern.h
src/dispnew.c
src/doc.c
src/editfns.c
src/emacs.c
src/eval.c
src/fileio.c
src/fns.c
src/fontset.c
src/frame.c
src/fringe.c
src/ftfont.c
src/gnutls.c
src/gnutls.h
src/gtkutil.c
src/indent.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/lread.c
src/minibuf.c
src/print.c
src/process.c
src/search.c
src/syntax.c
src/w32menu.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xml.c
src/xterm.c